sort buffers by number, make the order stable, easier to be used with quick match mode
Merge remote-tracking branch 'origin/master'