Merging Al's changes into the project trunk.