Merge pull request #1469 from georaldc/develop

Alternative fix to #1460