Merge branch 'testing'
authorStephen Frost <sfrost@snowman.net>
Tue, 14 Aug 2018 16:57:09 +0000 (12:57 -0400)
committerStephen Frost <sfrost@snowman.net>
Tue, 14 Aug 2018 16:57:09 +0000 (12:57 -0400)

Trivial merge