fixed php-syntax
Blah
Merge branch 'master' into jupis