Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 16:43:42 +0000 (12:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 Apr 2018 16:43:42 +0000 (12:43 -0400)

Trivial merge