Make sure that only string header values are converted
Merge branch 'master' into stable

Conflicts:
	setup.py