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