Avoid hard coding marshal header version
Skip directive processor cache
Merge branch 'master' into 4.x