Merge branch 'hotfix/1.6.67' v1.6.67
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Oct 2017 18:45:29 +0000 (14:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Oct 2017 18:45:29 +0000 (14:45 -0400)

Trivial merge