bug fix 4249

Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
Fix for Bug#4275

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
Merge pull request #913 from sampathLiyanage/bugfix4249

bug fix 4249
Translated using Weblate (Albanian)

Currently translated at 29.6% (814 of 2749)
Translated using Weblate (Swedish)

Currently translated at 99.1% (2726 of 2749)
Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
ChangeLog entry for fix of bug #4249

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1
Merge commit 'b6cd8cd'
Merge commit '7a5296b'
Merge commit 'fc36ed7'
Merge commit 'bc32d0c'
Translated using Weblate (Interlingua)

Currently translated at 42.2% (1158 of 2741)
Translated using Weblate (Swedish)

Currently translated at 98.4% (2699 of 2741)
Translated using Weblate (Turkish)

Currently translated at 100.0% (2741 of 2741)
Merge remote-tracking branch 'origin/master'
Merge pull request #916 from dhananjay92/Bug#4275

Fix for Bug#4275
ChangeLog entry for fix of bug #4275

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit '52084d8'
Merge commit '37dc085'