Merge branch 'release/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 17 Jan 2019 18:03:42 +0000 (13:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 17 Jan 2019 18:03:42 +0000 (13:03 -0500)

Trivial merge