Add support for embedded CSV files
Merge branch 'master' into release