Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:36 +0000 (14:48 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Oct 2017 18:48:36 +0000 (14:48 -0400)
v1.0.18


Trivial merge