Updates from r1765 merges