Rebase w3c-tr branch