Merge branch 'hotfix/1.6.42' v1.6.42
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:33:59 +0000 (08:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 7 Jun 2017 12:33:59 +0000 (08:33 -0400)

Trivial merge