Merged revisions 149266 via svnmerge from