Merge remote-tracking branch 'contiki-c64/master'