Make concat() a primary feature (not experimental)
Merge branch 'master' into text-escape-sequences

Conflicts:
	tests/CMakeLists.txt