Cherry-pick from master.

Conflicts:
	vimrc
updated