Merge branch 'hotfix/1.4.7' v1.4.7
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:23:53 +0000 (12:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 May 2015 16:23:53 +0000 (12:23 -0400)

Trivial merge