Merge remote-tracking branch 'upstream/master' into sortorder
fix ordering when two or more columns have the same weight
Merge remote-tracking branch 'origin/sortorder' into alltogether