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)
commitc86d6a895887bdfc9cb5c1a3615b6e2df8dab95c
treed1eaed66fa0bd3557a59afa6eed6d8b0a5feebd4
parent4a051a5dd0326879e3c368bdebd632ccd1228f7c
parent8123789fcf0eacf47843eebe2f99f3be26f90d39
Merge tag 'v2.6.4' into develop

v2.6.4