Implementation of feature Request 1412 with Reduced Code duplication
Edited changelog and applied PEAR standard. Feature Request 1412
Fix merge conflicts
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin