Merge branch 'master' into ocl2
Merge branch 'ocl2' of github.com:denzp/opencv into ocl2