NOJIRA Fix small issue in exporter
Merge branch 'master-fix' into develop