Merged revisions 130634 via svnmerge from