Merge tag 'v2.6.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:25 +0000 (14:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:06:25 +0000 (14:06 -0400)
v2.6.6


Trivial merge