[Merge] ~mkukri/ubuntu/+source/phpmyadmin:merge into ubuntu/+source/phpmyadmin:debian/sid

[Mate Kukri]

#ubuntu-devel discussion led to this being uploaded, there is still desire to eventually have this synced.
-- 
https://code.launchpad.net/~mkukri/ubuntu/+source/phpmyadmin/+git/phpmyadmin/+merge/456374
Your team Ubuntu Sponsors is requested to review the proposed merge of ~mkukri/ubuntu/+source/phpmyadmin:merge into ubuntu/+source/phpmyadmin:debian/sid.