Merged revisions 132311 via svnmerge from