Merge branch 'enh-multiline-tags', remote-tracking branch 'origin/also-skip-xml-comments'