Sort email by most recent
Merge remote-tracking branch 'origin/master'

Conflicts:
	gnus.el