Fixed merge conflict
Minor bugfix
Merge branch 'develop'

Conflicts:
	export/utils.py