Merge in WordPress trunk plugins.