Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:07 +0000 (11:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 May 2017 15:15:07 +0000 (11:15 -0400)

Trivial merge