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)
commita734f5a319e7f450ce70d6cb10229f6e360ab84e
tree256fca5264e14a01d53ac329d91258d71ae3ac8a
parent508d165ff64cd7770c29a7acd674e9df56b8bb62
parentb2bcb8c5a0ef1ae94b5cd0ba1abcb9b5c457d6df
Merge tag 'v2.6.5' into develop

v2.6.5