Merged in upstream master.