Strip tags for CSV
Merge branch 'develop'