Merge branch 'hotfix/1.5.18' v1.5.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:30 +0000 (16:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:30 +0000 (16:46 -0500)

Trivial merge