new version of conf.d patch
Merge branch master