Merged revisions 251309 via svnmerge from