Updated for hash database reworking
Merge remote-tracking branch 'upstream/develop' into rework_hashdb
Merge remote-tracking branch 'upstream/develop' into rework_hashdb
Merge pull request #431 from rcordovano/rework_hashdb

Rework hashdb