merge from contiki-os