Merge tag 'v1.4.1' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:54 +0000 (12:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:54 +0000 (12:20 -0400)
:


Trivial merge