Merge branch 'xml_language_support'
Merge branch 'jsp_language_support'
Merge branch 'yuidoc_coffeescript_comments'
Merge branch 'fix_segment_regex'