Pull request for issue #1283

Fixes #1283. Generated by conveyor-workflow.