Merged revisions 247168 via svnmerge from