Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Dec 2017 13:30:21 +0000 (08:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Dec 2017 13:30:21 +0000 (08:30 -0500)

Trivial merge