Better build
Merge branch 'master' of github.com:merguez-it/mgz-utils

Conflicts:
	src/util/CMakeLists.txt