Merge pull request #323 from tamird/fix-hash_including

Use ancestors' `hash_including` if available.
spec the right thing