Credit Evert Mouw for the portion of his PR that I accepted.
release-2.x.y
2019-11-05, John Bailey