Pull request for issue #921

Fixes #921. Generated by conveyor-workflow.