bugfixes all around
Merge branch 'develop'