[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 48c2f5: Merge remote-tracking branch 'origin/master'