Merge branch 'hotfix/1.6.100' v1.6.100
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Sep 2018 16:13:15 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 5 Sep 2018 16:13:15 +0000 (12:13 -0400)

Trivial merge