Fix for [86fb5ea28e].  Test will eventually merge in from tip280-test-coverage.
merge trunk