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