Pull request for issue #1291

Fixes #1291. Generated by conveyor-workflow.