Merge branch 'testing'
authorStephen Frost <sfrost@snowman.net>
Wed, 23 May 2018 23:35:30 +0000 (19:35 -0400)
committerStephen Frost <sfrost@snowman.net>
Wed, 23 May 2018 23:35:30 +0000 (19:35 -0400)

Trivial merge