Merge branch 'master' of feistymeow.org:feisty_meow into dev