Fix for #74
Merge remote-tracking branch 'origin/master' into June-Release