Merge branch 'release/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 2 Nov 2018 14:11:41 +0000 (10:11 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 2 Nov 2018 14:11:41 +0000 (10:11 -0400)

Trivial merge