Fork for fixes

utility/uip.h/shortlog@4acb22344932: not found in manifest