Merge branch 'master' into gfio

We need the crc function namespace change.