Changes for Marc.
Merge branch 'master' of https://github.com/JulianKunkel/siox

Conflicts:
	src/core/module/CMakeLists.txt