Split OIIO and OSL code paths. OIIO Texture system improvements.
Merge remote-tracking branch 'upstream/master' into est
Merge pull request #485 from est77/est

Split OIIO and OSL code paths. OIIO Texture system improvements.