Merge branch 'upstream' into quota

Conflicts:
	lib/imap.js
Fix undefined variable
Merge branch 'quota' into newfetch-quota

Conflicts:
	lib/imap.js