Merge branch 'hotfix/2.6.4' v2.6.4
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:36 +0000 (11:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:36 +0000 (11:09 -0400)

Trivial merge