Fix for issue #698
Merge branch 'develop'