Pull request for issue #1177

Fixes #1177. Generated by conveyor-workflow.