merge v1.0.2 -commit b1c42b6- into master

No match.