Pull request for issue #961

Fixes #961. Generated by conveyor-workflow.