Merging recent changes from trunk.