trying to resolve some encoding issues
conflicts

Merge remote branch 'origin'

Conflicts:
	RRDKit_0.6.tar.gz