Fix clicks on non-data links
Merge branch 'merge' into gh-pages