Merge pull request #10034 from annando/better-tag-sorting