Rebased to newest RIOT master