Merge branch 'origin/master'

Conflicts:
	cmake/config.h.in
	unittests/testInverseKinematics.cpp