Fixes #5552/BZ1093751 - Prevent sorting on columns that aren't sortable.
Merge pull request #4235 from waldenraines/5552

Fixes #5552/BZ1093751 - Prevent sorting on columns that aren't sortable.