To be honest... This is just a commit to move to another machine :P

I don't really know nor mind what was changed...