Port any relevant changes in https://github.com/sillsdev/machine/pull/397 from machine to machine.py. <!-- AUTO-GENERATED-ISSUE -->
Port any relevant changes in sillsdev/machine#397 from machine to machine.py.