Merge branch 'master' of ssh://codewiz.org/~/public_git/mandelwow