Fix it so hash indexes only return a flat list
Merge remote-tracking branch 'origin/master'