Bundles users vertically. Makes highlighted users the first.
Merge remote-tracking branch 'upstream/master'