[[ Bug 13139 ]] Incorrect parsing of <? segments in merge
Merge pull request #1025 from runrevsebastien/bugfix-13139

[[ Bug 13139 ]] Incorrect parsing of <? segments in merge