Merge in changes from 3.3.0rc2 release clone.