Updated from 14.11
Merge branch '14.10' into 14.11

Conflicts:
	14.07.txt
Update from 14.11
Merge branch '14.10' into 14.11

Conflicts:
	14.07.txt
Commit from 14.11
Merge branch '14.11'