Merge tags from 3.2.