More OSL attributes stuff.
Added more attributes.
Merge remote-tracking branch 'upstream/master' into est
Merge pull request #496 from est77/est

Small fixes & more OSL attributes.