Bug 1024741

[merge]