Pull request for issue #1485

Fixes #1485. Generated by conveyor-workflow.