Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 15:21:34 +0000 (11:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 2 Jul 2015 15:21:34 +0000 (11:21 -0400)

Trivial merge