Rebased and merge. @ogrisel, can you please renable jenkins py2.6