Add the tooltip
Merge branch 'gh-pages' into develop
Merge branch 'develop'
Fix the tooltip content
Merge branch 'develop'
Merge branch 'master' into gh-pages