Merge branch 'release/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 15 May 2017 20:21:56 +0000 (16:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 15 May 2017 20:21:56 +0000 (16:21 -0400)

Trivial merge