Fix for issue #624
Merge pull request #631 from redstar/issue624

Fix for issue #624
Merge branch 'master' into merge-2.064