Merge branch 'hotfix/1.0.2' master v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 18:37:56 +0000 (14:37 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 13 Jun 2018 18:37:56 +0000 (14:37 -0400)

Trivial merge