error.log must exist to tail
Merge branch 'master' into php