Last ditch effort to fix #3927, #3584
Merge branch 'master' of ssh://github.com/maqetta/maqetta