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

Trivial merge