Merge fix for dependency tracking.

[SVN r86532]