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