Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Jun 2019 20:36:30 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Jun 2019 20:36:30 +0000 (16:36 -0400)

Trivial merge