Merged revisions 134556 via svnmerge from