Merge mainline to 2.5.3-pre1
97 files changed