Merge branch 'hotfix/0.13.2'
Merge remote-tracking branch 'origin/master' into develop