Merge branch 'hotfix/3.6.2'
Fix for issue #876
release 3.6.3. Fixes #876
Merge branch 'hotfix/3.6.3' into develop