Merge branch 'hotfix/1.6.101' v1.6.101
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 20:06:30 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Sep 2018 20:06:30 +0000 (16:06 -0400)

Trivial merge