Merge branch 'hotfix/1.0.40' v1.0.40
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 12:47:36 +0000 (08:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Jul 2017 12:47:36 +0000 (08:47 -0400)

Trivial merge