Bug 920375 [merge]