Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 21:11:12 +0000 (16:11 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 21:11:12 +0000 (16:11 -0500)

Trivial merge