WP-1526: Add patch to fix exposed sorts and clicksort.