make set
Merge branch 'master' into testing

Conflicts:
	graph.c