Merge branch 'hotfix/1.6.91' v1.6.91
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Aug 2018 16:48:25 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Aug 2018 16:48:25 +0000 (12:48 -0400)

Trivial merge