Merge branch 'distances' of https://github.com/marinkaz/orange3 into distances
Fixed conflict