Pull request for issue #943

Fixes #943. Generated by conveyor-workflow.