Merged revisions 134915 via svnmerge from