Merge branch 'hotfix/2.6.5' v2.6.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:01:37 +0000 (14:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 18:01:37 +0000 (14:01 -0400)

Trivial merge