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


Trivial merge