Pull request for issue #951

Fixes #951. Generated by conveyor-workflow.