Merge branch 'hotfix/2.6.3' v2.6.3
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:02 +0000 (11:06 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:06:02 +0000 (11:06 -0400)

Trivial merge