Merged revisions 303678 via svnmerge from