Merged changes of core into wp