Merged revisions 124372 via svnmerge from