Merge branch 'hotfix/1.0.20' v1.0.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 Jul 2018 20:59:04 +0000 (16:59 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 Jul 2018 20:59:04 +0000 (16:59 -0400)

Trivial merge