Fix syncronize branch 3.0b1 from svn