Pull request for issue #1285

Fixes #1285. Generated by conveyor-workflow.