Fix bug with Tooltips being duplicated.
Merge branch 'master' into 68