Merge branch 'release/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Nov 2018 13:47:14 +0000 (08:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 14 Nov 2018 13:47:14 +0000 (08:47 -0500)

Trivial merge