Merged with WordPress trunk r24525-r24662.
Merge branch 'master' to pull down latest schema change.