Merge branch 'hotfix/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 16:12:53 +0000 (12:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 16:12:53 +0000 (12:12 -0400)

Trivial merge