Sync latest changes from master.