Merged from trunk r2214, fixing 3560932, Typo in response::content_location
Authored by: artyom-beilis 2012-08-28
Parent: [r2214]
Child: [r2216]