Merge with upstream
Added a patch for Suhosin 0.9.35