1.0.4.35: Commit Kevin Reid's "Test failure in core.test.sh" patch