Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jan 2018 18:27:40 +0000 (13:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jan 2018 18:27:40 +0000 (13:27 -0500)

Trivial merge