Merge branch 'hotfix/2.0.20' v2.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 May 2018 19:59:34 +0000 (15:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 May 2018 19:59:34 +0000 (15:59 -0400)

Trivial merge