Pull request for issue #957

Fixes #957. Generated by conveyor-workflow.