Merge branch 'hotfix/1.0.4' v1.0.4
authorLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 21:30:27 +0000 (16:30 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 9 Nov 2017 21:30:27 +0000 (16:30 -0500)

Trivial merge