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