Merge tags from 3.1.