Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0