Merge github.com:fredhamster/feisty_meow