Merge remote-tracking branch 'refs/remotes/upstream/master' into lsd

Conflicts:
	modules/imgproc/include/opencv2/imgproc.hpp
	modules/imgproc/src/lsd.cpp