brought important changes across from 3.03 branch, mostly version number stuff. namely r14565:14566, r14569:14570, r14573:14576, r14579:14580