Merge tags from 2.6.