Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jul 2018 20:49:19 +0000 (16:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jul 2018 20:49:19 +0000 (16:49 -0400)

Trivial merge