Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 14:31:00 +0000 (10:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 29 Aug 2018 14:31:00 +0000 (10:31 -0400)

Trivial merge