Merged revisions 121078 via svnmerge from