merge develop -D org -I include -E exclude: PR 482 (Remove 2003fc and related classes)
merge develop -D org -I include -E exclude: PR 485 (Fix export of multiple files (rebased onto develop))
merge develop -D org -I include -E exclude: PR 496 (Fix some minor Ant build issues)
merge develop -D org -I include -E exclude: PR 503 (GIF: add a few more things to the metadata table)
merge develop -D org -I include -E exclude: PR 504 (Prevent false positives in open file handle test)
merge develop -D org -I include -E exclude: PR 506 (Memoizer: use Location instead of File to represent 'id')