Synced with CVS expanded keywords