Merge branch 'master' of github.com:mn200/inspector-strategies

Conflicts:
	code/evalpc.ML