Merged revisions 121442 via svnmerge from