Update from 14.10
Merge branch '14.10' into 14.11

Conflicts:
	14.07.txt