imported from CVS release_15