Pull request for issue #1525

Fixes #1525. Generated by conveyor-workflow.