update to newest upstream commits