Merge branch 'hotfix/1.1.21' v1.1.21
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:52 +0000 (12:05 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Apr 2018 16:05:52 +0000 (12:05 -0400)

Trivial merge