4.2.3-dev

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2