Merge branch 'smuehlst-bit-fields-type'