Merge branch 'master' of ssh://feistymeow.org/feisty_meow