Merged revisions 135055 via svnmerge from