upstream update to 7.3.931
Merge branch 'master' into py3do
Merge branch 'py3do' into all