Merge branch 'release/2.0.18' v2.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 22 Feb 2018 17:34:48 +0000 (12:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 22 Feb 2018 17:34:48 +0000 (12:34 -0500)

Trivial merge