Merge.

[SVN r42408]
Fix some merge errors.

[SVN r42409]