Updated source from SVN 1.3 branch