Force Push on master

Hi,

FYI there was a mishap by an anonymous RIOT maintainer this morning which got fixed by a force push to restore the correction version RIOT master. Therefore, I had to remerge https://github.com/RIOT-OS/RIOT/pull/2742 and Cenk's merge commit got lost.

Sorry for any inconvenience!

Cheers, Oleg