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