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