Merge branch 'hotfix/1.6.85' v1.6.85
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Jun 2018 16:15:48 +0000 (12:15 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Jun 2018 16:15:48 +0000 (12:15 -0400)

Trivial merge