Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92