Merge branch 'testing' into premaster
authorStephen Frost <sfrost@snowman.net>
Tue, 26 Jun 2018 21:47:57 +0000 (17:47 -0400)
committerStephen Frost <sfrost@snowman.net>
Tue, 26 Jun 2018 21:47:57 +0000 (17:47 -0400)

Trivial merge