fix for issue #1488
Merge branch 'develop'