Merge branch 'testing'
authorStephen Frost <sfrost@snowman.net>
Tue, 11 Sep 2018 19:26:17 +0000 (15:26 -0400)
committerStephen Frost <sfrost@snowman.net>
Tue, 11 Sep 2018 19:26:17 +0000 (15:26 -0400)

Trivial merge