Fixed last PR comments.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into OSL_work
OSL transparecy work
Fixed PR comments.
Merge pull request #348 from est77/OSL_work

OSL wip transparency work