Merged revisions 313279 via svnmerge from