Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Oct 2017 12:50:17 +0000 (08:50 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Oct 2017 12:50:17 +0000 (08:50 -0400)

Trivial merge