Merge branch 'master' into feature569
Merge remote-tracking branch 'origin/master' into feature569
Merge branch 'feature569' of https://github.com/Tithugues/phpmyadmin into feature569