Pull request for issue #911

Fixes #911. Generated by conveyor-workflow.