Merge branch 'master' into cleanup-7

Conflicts:
	plugins/newmail_notifier/newmail_notifier.js