Pull request for issue #917

Fixes #917. Generated by conveyor-workflow.