Update from 14.10
Update from 14.11
Merge branch '14.10' into 14.11

Conflicts:
	14.07.txt
Merge branch '14.11' into 14.12

Conflicts:
	14.07.txt