Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 59f3ca6201c1487f3a4aceafe2c4a96201e58ce7

1
2
3
/^\s*(LoadModule|LoadFile|Include)(\s+|[\\\\])/mi
/^\s*(SuexecUserGroup|suPHP_UserGroup|suPHP_PHPPath|suPHP_ConfigPath)(\s+|[\\\\])/mi
/^\s*(FCGIWrapper|FastCgiExternalServer)(\s+|[\\\\])/mi