Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>