Merge branch 'hotfix/1.0.21' v1.0.21
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Apr 2018 13:08:25 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Apr 2018 13:08:25 +0000 (09:08 -0400)

Trivial merge