Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 19:12:47 +0000 (15:12 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 Jun 2018 19:12:47 +0000 (15:12 -0400)

Trivial merge