Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:04 +0000 (17:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Nov 2017 21:08:04 +0000 (17:08 -0400)
v1.0.18


Trivial merge