Merged revisions 334357 via svnmerge from