Fix hash compare
Merge branch 'master' into davis_master