Pull request for issue #1505

Fixes #1505. Generated by conveyor-workflow.