Merge pull request #830 from jeffgbutler/case-in-order-by

Merge pull request #830 from jeffgbutler/case-in-order-by #445