Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-19 dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c

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