Merge branch 'release/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 31 Aug 2018 12:40:30 +0000 (08:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 31 Aug 2018 12:40:30 +0000 (08:40 -0400)

Trivial merge