Merged in upstream master