merge with branch 1.4 from svn