Merge branch 'hotfix/1.6.64' v1.6.64
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Sep 2017 17:22:31 +0000 (13:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 1 Sep 2017 17:22:31 +0000 (13:22 -0400)

Trivial merge