Don't explode if an image 404s
Even greater realism in mocking a 404 error
Always use force_text, present since 1.4.2.
Merge remote-tracking branch 'james/404'