Merge branch 'release/1.0.18' master v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jun 2019 16:57:48 +0000 (12:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 20 Jun 2019 16:57:48 +0000 (12:57 -0400)

Trivial merge