Merged in official master.