Merge branch 'hotfix/1.4.6' v1.4.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:41 +0000 (14:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:41 +0000 (14:15 -0400)

Trivial merge