Itseez/opencv_contrib — pull request #50 by alalek (2014-08-06 09:39:10+00:00)
Title: World fix

Merge with https://github.com/Itseez/opencv/pull/3039

**WIP** (skip tests run, see results of main PR)