Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/imgproc/doc/feature_detection.rst