this changes have not been pulled up to the 1.4 branch but they are in
the 1.5 branch because they were on the trunk when the 1.5 branch was cut.