Merged revisions 305131 via svnmerge from