Nils Gillmann writes: --snipsnap-- I hope this works, I pulled from master some minutes ago, I merged the branch, squashed the commits into one with softreset,... I really hope I did it right. It takes some time getting used to more git usage.