Merge branch 'testing'
authorStephen Frost <sfrost@snowman.net>
Thu, 24 May 2018 14:39:29 +0000 (10:39 -0400)
committerStephen Frost <sfrost@snowman.net>
Thu, 24 May 2018 14:39:29 +0000 (10:39 -0400)

Trivial merge