Merge branch 'cb/avoid-colliding-with-netbsd-hmac'