Merge branch 'hotfix/2.4.2' v2.4.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:21 +0000 (12:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:36:21 +0000 (12:36 -0400)

Trivial merge