sync with 1.0.2 svn repo