Merged upstream into master.