Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:04:32 +0000 (16:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 28 Jun 2018 20:04:32 +0000 (16:04 -0400)

Trivial merge