Apply vodz' last_patch52
10 files changed