Merge branch 'hotfix/1.6.69' v1.6.69
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Oct 2017 16:22:08 +0000 (12:22 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Oct 2017 16:22:08 +0000 (12:22 -0400)

Trivial merge