Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-11 8e7f89749f427c3ba3fe0929fe3d536acc485302

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