Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:14 +0000 (10:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 23 May 2017 14:49:14 +0000 (10:49 -0400)
v1.0.18


Trivial merge