Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 20:02:23 +0000 (16:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 May 2017 20:02:23 +0000 (16:02 -0400)

Trivial merge