[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4fe8bb: Merge branch 'MAINT_4_0_6' into QA_4_0