Minor
Merged
Merge branch 'master' into merging

Conflicts:
	svm/test.cpp