Merge branch 'rhashtable-cleanups'