update fork

update fork to latest trunk