Pull in PR #58.