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