Merge pull request #1945 from GDmac/develop

Fix #1938