Merge tag 'v2.4.2' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:25 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:25 +0000 (12:36 -0400)
v2.4.2


Trivial merge