Fixed bug from maintenance branch merge
Fixed bug from maintenance branch merge

appleseedhq/cortex,hradec/cortex,appleseedhq/cortex,goddardl/cortex,appleseedhq/cortex,goddardl/cortex,lento/cortex,goddardl/cortex,hradec/cortex,lento/cortex,lento/cortex,hradec/cortex