Merge remote-tracking branch 'remotes/upstream/master' into HEAD

Conflicts:
	lib/OpenLayers/Layer/Vector.js
	tests/Control/SelectFeature.html
	tests/Layer/Vector.html