Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev