Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:19:25 +0000 (16:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 30 Mar 2016 20:19:25 +0000 (16:19 -0400)

Trivial merge