Merged revisions 134540 via svnmerge from