World fix

Merge with https://github.com/Itseez/opencv/pull/3039

**WIP** (skip tests run, see results of main PR)