Merged revisions 148257 via svnmerge from