Merge remote-tracking branch 'contiki-devel-environment/master'