Merge branch 'release/2.3.2' v2.3.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jul 2016 15:52:05 +0000 (11:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jul 2016 15:52:05 +0000 (11:52 -0400)

Trivial merge