Merge branch 'siphash'