Merge branch 'mdio-fixes'