[ci skip] make yardoc happy
Merge branch 'master' into 0.2.x