Quick untested merge to 2.5.3-pre4
157 files changed