Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki