Merge branch 'mg/pretty-magic-space'