Merge in changes from 3.3.0 release clone.