Merge branch 'hotfix/1.0.42' v1.0.42
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:59:54 +0000 (10:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 25 Oct 2017 14:59:54 +0000 (10:59 -0400)

Trivial merge