Merged revisions 130735 via svnmerge from