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