Merge pull request #1 from contiki-os/master

Branch update from Contiki-OS