Merged revisions 142474 via svnmerge from