Merge mainline to 2.5.4-pre1
110 files changed