Merge branch 'release/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:38:09 +0000 (15:38 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 27 Nov 2017 20:38:09 +0000 (15:38 -0500)

Trivial merge