Pull request for FW308

This PR includes also changes for IOT-Lab M3 (FW293). But these changes do not interfere with FW308.