Pull request for issue #758

Fixes #758. Generated by conveyor-workflow.