0.5.40927 bugfixes
Merge remote-tracking branch 'origin/master'