add fast Block::Id(). id is ((kind) << 8 | sub)
Merge branch 'master' into shred_preload

add Block::Id()