Fix for issue #897
Merge branch 'develop'