Merge branch 'hotfix/1.0.1'
Merge remote-tracking branch 'upstream/master' into develop