Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 20:52:43 +0000 (16:52 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 10 May 2017 20:52:43 +0000 (16:52 -0400)

Trivial merge