bugid-110154: grab whole caption of an image
(cherry picked from commit 456a94c)
bugid-110154: Concatenated correctly a caption
(cherry picked from commit f572472)
bugid-110154: Since this part is not fed back to parser I have to replace links my self
(cherry picked from commit 9c1fe4a)
bugid-110154: Re-add doc
(cherry picked from commit 55e9aee)
Merge branch 'release-164-bugid-110154' into release-164