keep older PHP from breaking
Merge remote-tracking branch 'origin/master'