Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jun 2018 16:13:35 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jun 2018 16:13:35 +0000 (12:13 -0400)

Trivial merge