Merge changes from 1.3e (RIOT emulation improvements)