Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Mon, 6 Jun 2016 21:02:48 +0000 (17:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 6 Jun 2016 21:02:48 +0000 (17:02 -0400)

Trivial merge