Clarify code path
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin