Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:27:49 +0000 (14:27 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 16 Jan 2018 19:27:49 +0000 (14:27 -0500)
v1.0.18


Trivial merge