Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jun 2018 15:12:20 +0000 (11:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 26 Jun 2018 15:12:20 +0000 (11:12 -0400)

Trivial merge