Merge branch 'separate-os-api-testing'
authorStephen Sinclair <radarsat1@gmail.com>
Sat, 11 Aug 2018 01:45:56 +0000 (21:45 -0400)
committerStephen Sinclair <radarsat1@gmail.com>
Sat, 11 Aug 2018 01:45:56 +0000 (21:45 -0400)

Trivial merge