Bug 917713 [merge]