Merge pull request #6619 from colemanw/jsortable