[yanan] ready for release
Merge remote-tracking branch 'upstream/master'