Diffusion and drift in a medium with randomly distributed traps