Merge branch 'master' into yarp-2.4

Conflicts:
	conf/CMakeLists.txt
	src/libYARP_OS/src/Run.cpp
Merge branch 'master' into yarp-2.4