[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7153a4: Correctly merge server variables fix to master