Deploy issue 3920 redux

This was branched off the *deploy* branch, and is pull-requested against the deploy branch, so it can go in without pulling any of the newly merged issues, if faster testing is wanted.

http://code.google.com/p/otwarchive/issues/detail?id=3920