Update modified files to reflect last trunk.