Merge branch 'hotfix/2.10.40' v2.10.40
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 14:00:20 +0000 (10:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Aug 2018 14:00:20 +0000 (10:00 -0400)

Trivial merge