Seems like I didn't manage to let git automatically merge master into my branch, so I created (again... doh!) a new branch that should be clean. Old merge request deleted, created a new one. -- Syron