Fix for issue #840
Merge branch 'develop'