Merging version 2.1 RC to main trunk.