Fix brokenness when trying to sort without the th
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages