FW-238. Fix for VS, per https://openwsn.atlassian.net/browse/FW-238?focusedCommentId=16514&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16514.
Merge remote-tracking branch 'openwsn/develop' into develop