Bug 927192 [merge]