Imported upstream 5297:a333c18d7048
Merge against vim 7.4

Conflicts:
	src/feature.h