Merge branch 'release/1.0.2' v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Feb 2018 13:15:55 +0000 (08:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Feb 2018 13:15:55 +0000 (08:15 -0500)

Trivial merge