Sync with latest upstream master.