Merged revisions 148611 via svnmerge from