Merge trunk to my fork?