Merge tag 'v2.3.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jul 2016 15:52:09 +0000 (11:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jul 2016 15:52:09 +0000 (11:52 -0400)
v2.3.2


Trivial merge