Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Fri, 14 Jun 2019 16:40:59 +0000 (12:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 14 Jun 2019 16:40:59 +0000 (12:40 -0400)

Trivial merge