Pulled from upstream to new version.