Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl