Merge pull request #3807 from thess/umurmur-update