Discrete and continuous random walk models for space-time fractional diffusion