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