Merge mainline to 2.5.2-pre9
1050 files changed