Merge branch 'master' of git+ssh://johnfredcee@repo.or.cz/srv/git/mixamesh