Bug 927618 [merge]