Merge branch 'dev' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Wed, 3 Jan 2018 17:14:13 +0000 (12:14 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 3 Jan 2018 17:14:13 +0000 (12:14 -0500)

Trivial merge