Merge branch 'hotfix/2.6.6' v2.6.6
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:20 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:20 +0000 (14:06 -0400)

Trivial merge