Revert "Revert "Merge branch 'slash_mid' of ssh://github.com/maqetta/maqetta into slash_mid""

This reverts commit 12696acafb928936649723771a99f157ff7a5cc5.