Merge tag 'v1.5.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:34 +0000 (16:46 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 20 Feb 2018 21:46:34 +0000 (16:46 -0500)
v1.5.18


Trivial merge