Merge branch 'testing' into premaster
authorStephen Frost <sfrost@snowman.net>
Tue, 26 Jun 2018 13:40:50 +0000 (09:40 -0400)
committerStephen Frost <sfrost@snowman.net>
Tue, 26 Jun 2018 13:40:50 +0000 (09:40 -0400)

Trivial merge