Merge branch 'str_bytes_fix'

Conflicts:
	enumfields/enums.py