Pull request for issue #1511

Fixes #1511. Generated by conveyor-workflow.