Fix many things
Merge branch 'master' of https://github.com/northernbear/php