Bug 952513 [merge]