OK, rebasing and merging. After that @ogrisel will re-enable the 2.6
buildbot