Merge branch 'master' into 'master'

Marius Cramer

2015-07-21 de34a9d7754c9f8b6e8af4334b3950dc886ad064

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