Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 d933cc2708fe10e648a9b454ba4c0b81ebb606c7

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