these are Rune's changes. 

I have no idea what they contain, I'm just PRing this because he doesnt know how to use git.