Pull request for issue #907

Fixes #907. Generated by conveyor-workflow.