Merge branch 'release/1.7.18' v1.7.18
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Jan 2019 13:48:39 +0000 (08:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Jan 2019 13:48:39 +0000 (08:48 -0500)

Trivial merge