Merge branch 'release/0.3'
Bumped version number.
Merge branch 'release/0.3.1'
Merge branch 'release/0.3.2'

Conflicts:
	setup.py
Merge branch 'release/0.3.3'
Merge branch 'release/0.3.4'
Merge branch 'release/0.3.5'
Assume that the user name in the X-FOST-User header will be UTF-7 encoded.
Merge branch 'release/0.3.6'

Conflicts:
	setup.py
Merge branch 'master' into develop