Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Fri, 24 Aug 2018 20:08:03 +0000 (16:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 24 Aug 2018 20:08:03 +0000 (16:08 -0400)

Trivial merge