Merge branch 'hotfix/1.0.46' v1.0.46
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Nov 2017 12:12:16 +0000 (08:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Nov 2017 12:12:16 +0000 (08:12 -0400)

Trivial merge