Pull request for issue #1509

Fixes #1509. Generated by conveyor-workflow.