Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 14:40:10 +0000 (10:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 2 May 2018 14:40:10 +0000 (10:40 -0400)

Trivial merge