Add.
Merge remote-tracking branch 'sam/hashdb_comments' into hashdb_comments