Merge branch 'master' of https://github.com/amplab/shark into csd-2.10

Conflicts:
	run