Merged revisions 125327 via svnmerge from