Pull request for issue #941

Fixes #941. Generated by conveyor-workflow.