3.0.x-fixes.diff
