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