Merged revisions 130959 via svnmerge from