Merge branch 'hotfix/2.10.42' v2.10.42
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 16:51:54 +0000 (12:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 16:51:54 +0000 (12:51 -0400)

Trivial merge