Merge branch 'hotfix/1.6.75' v1.6.75
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Feb 2018 15:27:16 +0000 (10:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Feb 2018 15:27:16 +0000 (10:27 -0500)

Trivial merge