Merge WordPress trunk.