Give more conservative head room for avoid Map's with an imperfect hash distribution filling up.
Merge remote-tracking branch 'origin/master'