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