OSL merge 7

OSL shader param and shader connection classes.