Merge mainline to 2.5.4-pre3
4 files changed