[PR] Additional WordPress 4 updates before first merge