Merge "Fix loading of cdex files."