Implement redirect handling

Add handling for two more kinds of redirects:

Edited by Sarah German