Merge remote-tracking branch 'hggit/python3' into python3

17 months ago, Edouard Tisserant