Merge branch 'release/1.0.18' v1.0.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jun 2018 17:48:12 +0000 (13:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jun 2018 17:48:12 +0000 (13:48 -0400)

Trivial merge