Pull request for issue #1275

Fixes #1275. Generated by conveyor-workflow.