Merge branch 'release/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Aug 2018 18:53:43 +0000 (14:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Aug 2018 18:53:43 +0000 (14:53 -0400)

Trivial merge