Merge branch 'hotfix/1.0.42' v1.0.43
authorLaury GvR <laury@gaslightmedia.com>
Tue, 12 Jul 2016 20:55:37 +0000 (16:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 12 Jul 2016 20:55:37 +0000 (16:55 -0400)

Trivial merge