Merge pull request #166 from helmo/master

Place some more variable names between curly braces
Update po files
Fix typo
Correct detection of the Chrome browser
Merge pull request #167 from lem9/chrome_detection

Correct detection of the Chrome browser
Merge branch 'QA_3_5'
3.5.7-rc1
Merge branch 'MAINT_3_5_7' into QA_3_5
3.5.8-dev
Merge branch 'QA_3_5'
Fix merge conflict
Add missing query to dummy driver

This is needed to run testsuite on Windows.
Correctly test for PHP_OS detection