Import branch 1.3.x from svn