Sync ObsoleteFiles.inc with master