Updating forked master, before bringing WordPress up to date.