Bug 1025204

[merge]