Merge branch 'release/1.2.33' v1.2.33
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 19:16:19 +0000 (14:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 19:16:19 +0000 (14:16 -0500)

Trivial merge