Merge branch 'cm-11.0' into cm-10.2

Conflicts:
	Makefile
Merge branch 'cm-10.2' into martincz