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