Merge tag 'v2.4.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 17:59:36 +0000 (12:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 20 Feb 2017 17:59:36 +0000 (12:59 -0500)
v2.4.1


Trivial merge