Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 8 Dec 2017 18:05:49 +0000 (13:05 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 8 Dec 2017 18:05:49 +0000 (13:05 -0500)

Trivial merge