Merge with upstream and update copyright date