Merged revisions 126056 via svnmerge from