Merge branch 'hotfix/1.6.10' v1.6.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 16:38:13 +0000 (11:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 16:38:13 +0000 (11:38 -0500)

Trivial merge