Merged r56745 from wmf-deployment, with an adjusted comment. Fixes image redirect...