Merge branch 'hotfix/2.4.1' v2.4.1
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 17:59:31 +0000 (12:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 17:59:31 +0000 (12:59 -0500)

Trivial merge