bug #3985 Call to undefined function mb_detect_encoding
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Merge commit 'f0232c3'
Merge commit 'fae5e7d'