Merged revisions 133169 via svnmerge from