Merge tag 'v2.6.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:44 +0000 (11:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 4 Oct 2016 15:09:44 +0000 (11:09 -0400)
v2.6.4


Trivial merge