Quick fix for issue #556
Merge branch 'master' into develop