Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Wed, 23 Jan 2019 18:21:34 +0000 (13:21 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 23 Jan 2019 18:21:34 +0000 (13:21 -0500)

Trivial merge