Update global-jjb to latest master