Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Thu, 15 Nov 2018 19:53:40 +0000 (14:53 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 15 Nov 2018 19:53:40 +0000 (14:53 -0500)

Trivial merge