Remove *.orig files.
Sync with latest branch.