Merge.

[SVN r42408]