fix typo, thanks oliverzy!
Merge branch 'master' into 0.6.0