Bug 920745 [merge]