Update 1.4 from SVN