Show hit ID as well as def.
Merge branch 'master' into gh-pages