r3605: * sync up with 3.0 with the exception of volker's recent changes