Merge branch 'master' of feistymeow.org:feisty_meow into dev
authorChris Koeritz <fred@gruntose.com>
Sun, 7 Jan 2018 16:32:15 +0000 (11:32 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 7 Jan 2018 16:32:15 +0000 (11:32 -0500)

Trivial merge