Merge branch 'hotfix/1.0.46' v1.0.46
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jul 2018 12:14:35 +0000 (08:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Jul 2018 12:14:35 +0000 (08:14 -0400)

Trivial merge