Merged revisions 120959 via svnmerge from