Merge tag 'v1.0.18' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:12 +0000 (11:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:12 +0000 (11:15 -0400)
v1.0.18


Trivial merge