Merge branch 'release/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 26 Nov 2018 19:29:05 +0000 (14:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 26 Nov 2018 19:29:05 +0000 (14:29 -0500)

Trivial merge