Merge tag 'v1.2.32' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:35:53 +0000 (10:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 15:35:53 +0000 (10:35 -0500)
v1.2.32


Trivial merge