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