Merge changes from uthash upstream.