Merged revisions 134649 via svnmerge from