Pull request for issue #1507

Fixes #1507. Generated by conveyor-workflow.