Merge Linux upstream v3.4.98