Merge branch 'release/1.0.2' master v1.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jan 2019 20:30:47 +0000 (15:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jan 2019 20:30:47 +0000 (15:30 -0500)

Trivial merge