Merged revisions 132826 via svnmerge from