Imported changes from branch 1.14 of CVS