Merge branch 'r8169-fixes'