3.913 merge (messy)

This looks like I will have to manually go over file by file but...
let's see what happens anyway! =)