Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:15:35 +0000 (15:15 -0500)
grabbing the latest from dev


Trivial merge