Merge branch 'hotfix/1.6.74' v1.6.74
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jan 2018 14:22:29 +0000 (09:22 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jan 2018 14:22:29 +0000 (09:22 -0500)

Trivial merge