(cherry picked from commit b4033e899e318707a732203584c6aee0d9c178c8)

# Conflicts:
#	modules/stereo/processors/stereocameragenerator.cpp