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

Trivial merge