Cal's pull request - ready for release.