Merge fix from upstream pull.