Commit from 14.11
Merge branch '14.11' into 14.12

Conflicts:
	14.07.txt