Merge branch 'hotfix/1.6.8' v1.6.8
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Feb 2017 16:57:25 +0000 (11:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Feb 2017 16:57:25 +0000 (11:57 -0500)

Trivial merge