Merged revisions 124315 via svnmerge from