Ok, if no serious problems will pop up, I will merge the branch tomorrow. I really want to have it merged fast to avoid a lot of conflicts. But just say if I'm too fast :D. I can wait longer if you want to test it more :)