Merged revisions 124450 via svnmerge from