Merge remote-tracking branch 'mfischer/python' into next