Merge compilation changes
Merge branch 'for_pr' of https://github.com/f-morozov/opencv into for_pr