Merge branch 'hotfix/1.6.70' v1.6.70
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 Oct 2017 12:37:09 +0000 (08:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 Oct 2017 12:37:09 +0000 (08:37 -0400)

Trivial merge