Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 18:45:32 +0000 (14:45 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Jun 2016 18:45:32 +0000 (14:45 -0400)

Trivial merge