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