Merge tag 'v2.3.3' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:23:09 +0000 (08:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 3 Aug 2016 12:23:09 +0000 (08:23 -0400)
v2.3.3


Trivial merge