Merge branch 'hotfix/2.0.21' v2.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 May 2018 20:02:41 +0000 (16:02 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 May 2018 20:02:41 +0000 (16:02 -0400)

Trivial merge