Merge tag 'v1.2.33' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 19:16:24 +0000 (14:16 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Dec 2016 19:16:24 +0000 (14:16 -0500)
v1.2.33


Trivial merge