Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 7 Aug 2017 12:59:15 +0000 (08:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 7 Aug 2017 12:59:15 +0000 (08:59 -0400)

Trivial merge