Fork for fixes

utility/uip_timer.c/shortlog@a0b1d0e6d237: not found in manifest