Merged revisions 305198 via svnmerge from