A fix to the csv export
Merge branch 'hotfix-2.1.15'