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