Updated from 14.09
Merge branch '14.09' into 14.10

Conflicts:
	14.07.txt