Merge branch 'master' into handy_context_manager

Conflicts:
	unicodecsv/__init__.py
Merge branch 'master' of https://github.com/blagarde/python-unicodecsv into handy_context_manager