Merge branch 'hotfix/1.0.32' v1.0.32
authorLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 15:43:17 +0000 (10:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 6 Dec 2016 15:43:17 +0000 (10:43 -0500)

Trivial merge