[Phpmyadmin-git] [phpmyadmin/phpmyadmin] a2d487: Merge branch 'MAINT_4_0_2' into QA_4_0