Merged revisions 12161 via svnmerge from