Pull request for issue #1077

Fixes #1077. Generated by conveyor-workflow.