Temp: Commented out de-wrapping from (auto)paragraphs in drupalimagecaption, which produces errors.