require a version 4.0.10.4 of phpMyAdmin
Merge branch 'master-devel'