Pull request for issue #949

Fixes #949. Generated by conveyor-workflow.