Pull request for issue #969

Fixes #969. Generated by conveyor-workflow.