Adapting code compatibility with PHP FastCGI
Merge commit '0c70ce2' into 2.0