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