fix bug with DeliteFileReader being incompatible with flatmap fix in 5385cced0f846fc875c333758b64177736ce7dad
Merge branch 'develop-dmz' of github.com:stanford-ppl/Delite into develop-dmz