added fixes from arnold procedural
Merge branch 'master' into develop