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