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

Trivial merge