Merge branch 'hotfix/1.6.94' v1.6.94
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Aug 2018 12:56:28 +0000 (08:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Aug 2018 12:56:28 +0000 (08:56 -0400)

Trivial merge