Pull request for issue #947

Fixes #947. Generated by conveyor-workflow.