Update fork's master with upstream master