Merge remote-tracking branch 'origin/master' into master1

Conflicts:
	graph.dot