Merge branch 'hotfix/bug'
Merge branch 'master' into release/v1.0