Merge branch 'release/1.0.2' v1.0.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 28 Aug 2018 13:24:49 +0000 (09:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 28 Aug 2018 13:24:49 +0000 (09:24 -0400)

Trivial merge