Merge branch 'hotfix/1.6.9' v1.6.9
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:46 +0000 (14:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Feb 2017 19:56:46 +0000 (14:56 -0500)

Trivial merge