Merge pull request #1954 from pentschev:ocl_features2d_fast_master