Merge branch 'hotfix/0.4.2' v0.4.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:55:15 +0000 (13:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:55:15 +0000 (13:55 -0400)

Trivial merge