Merge from Haddock: Add <<url>> for images