Merge remote-tracking branch 'upstream/master' into test

Conflicts:
	Readme.md
	vimrc