Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 20:05:29 +0000 (16:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 20:05:29 +0000 (16:05 -0400)

Trivial merge