Merge branch 'release/0.3.5' into develop
Assume that the user name in the X-FOST-User header will be UTF-7 encoded.
Bumped version number
Merge branch 'release/0.3.6'

Conflicts:
	setup.py