Merge also upstream so we can push properly