[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6d2efd: Merge branch 'MAINT_4_0_5' into QA_4_0