Merged upstream master, add missing change