Merge branch 'master' into yarp-2.4

Conflicts:
	src/libYARP_OS/src/RosNameSpace.cpp