[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4c7d3c: Merge remote-tracking branch 'origin/master'