Merge branch 'release/1.1.18' v1.1.18
authorLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 15:44:20 +0000 (11:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 1 Nov 2017 15:44:20 +0000 (11:44 -0400)

Trivial merge