Merged revisions 149452 via svnmerge from