Rebase to jpeg src v9

All previous history has been included