[ci skip] Fix API docs
Merge branch 'master' into 0.2.x