Port to 1 7 10 bring fork up to date with upstream