Update to make PHPCI working
Merge remote-tracking branch 'origin/master'