Branch update from Contiki-OS