Allow override of MySQLi preference
Revert setSort function in light of new approach
Merge remote-tracking branch 'origin/master' into global-sort-settings