Update from upstream master.