Merge branch 'release/1.1.8' v1.1.8
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 16:39:54 +0000 (12:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Apr 2018 16:39:54 +0000 (12:39 -0400)

Trivial merge