all commits for 1522 squashed
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Merge branch 'drag-n-drop-import' of https://github.com/mebjas/phpmyadmin into drag-n-drop-import