Merge branch 'mii_bmcr_encode_fixed'