Merged r1220 from the CEDMA refactoring branch to the trunk. #494 (Import of missing values given as ;; doesn't work)