Merge branch 'master' into integrate_weavedns

Conflicts:
	weave