tooltip links
Merge remote-tracking branch 'origin/Dev-jsomerville'