Merge branch 'release/1.0.2' v1.0.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 19:26:56 +0000 (15:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 1 Nov 2016 19:26:56 +0000 (15:26 -0400)

Trivial merge