Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:07:17 +0000 (12:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 20 Apr 2018 16:07:17 +0000 (12:07 -0400)
v1.0.18


Trivial merge