Merge branch 'master' of feistymeow.org:feisty_meow into development
authorChris Koeritz <fred@gruntose.com>
Thu, 9 Nov 2017 22:27:30 +0000 (17:27 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 9 Nov 2017 22:27:30 +0000 (17:27 -0500)

Trivial merge