Merge branch 'master' into osx

Conflicts:
	muttrc