http://youtrack.jetbrains.com/issue/SCL-6191 {wrong highlighting with inconsistent html}
Merge remote-tracking branch 'origin/master'