Merge pull request #1840 from nnnick/fix/1731-part-2

Better handling of large tooltips