Merge branch 'master' into bit-fields-type