Merge branch 'rotation-4-5' into rotation

Conflicts:
	src/tools/Makefile.am

diff --cc include/string2.h
Simple merge

diff --cc include/vec.h
Simple merge

diff --cc src/kernel/CMakeLists.txt
Simple merge

diff --cc src/tools/CMakeLists.txt
Simple merge