Merge branch 'master' into gh/master

Conflicts:
	offlineimap/folder/Base.py