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