Pull request for issue #963

Fixes #963. Generated by conveyor-workflow.