would you mind integrating changes from https://github.com/RIOT-OS/RIOT/pull/971 right away?