Merge branch 'origin/release-2.2'

Conflicts:
	apps/CMakeLists.txt
	src/kinematics/ShapeMesh.cpp
	unittests/CMakeLists.txt