Merge branch 'hotfix/1.6.95' v1.6.95
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 16:58:11 +0000 (12:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Aug 2018 16:58:11 +0000 (12:58 -0400)

Trivial merge