Sync with upstream and CVS keywords