Pull request for issue #1269

Fixes #1269. Generated by conveyor-workflow.