try to
dMerge branch 'master' into develop

Conflicts:
	kmeans/useless.py