Merged revisions 121596 via svnmerge from