Production hotfixes and updates
Merge branch 'master' of github.com:borbit/muchmala