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


Trivial merge