Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 19:22:48 +0000 (14:22 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Nov 2017 19:22:48 +0000 (14:22 -0500)

Trivial merge