Bug 982482

[merge]