Merge branch 'hotfix/1.0.10' v1.0.10
authorLaury GvR <laury@gaslightmedia.com>
Thu, 17 Aug 2017 20:26:29 +0000 (16:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 17 Aug 2017 20:26:29 +0000 (16:26 -0400)

Trivial merge