Merge branch 'testing'
authorStephen Frost <sfrost@snowman.net>
Wed, 22 Aug 2018 17:34:11 +0000 (13:34 -0400)
committerStephen Frost <sfrost@snowman.net>
Wed, 22 Aug 2018 17:34:11 +0000 (13:34 -0400)

Trivial merge