Pull request for issue #935

Fixes #935. Generated by conveyor-workflow.