Merge tag 'v2.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 22 Feb 2018 17:34:53 +0000 (12:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 22 Feb 2018 17:34:53 +0000 (12:34 -0500)
v2.0.18


Trivial merge