Pull request for issue #905

Fixes #905. Generated by conveyor-workflow.