refinement of error handling
Merge remote-tracking branch 'origin/global-sort-settings'
remove erroneous comment
prevent forgery of disposition
Only switch to MySQLi on the initial setup load

In case MySQLi does not work, this allows the preference to be
overridden
Merge remote-tracking branch 'origin/master' into 1.4.6