Merge branch 'hotfix/1.4.1' v1.4.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:21 +0000 (12:20 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 30 Apr 2015 16:20:21 +0000 (12:20 -0400)

Trivial merge