Merge remote-tracking branch 'gitlab/master'
Merge branch 'master' of github.com:thx/magix
Moved stuff into gh-pages