Fixes for OSL object space + hierarchical instancing.
Merge branch 'master' into est
Merge pull request #555 from est77/est

Fixes for OSL object space + hierarchical instancing.
Fixed PR coments, solved conflicts.