Pull request for issue #1541

Fixes #1541. Generated by conveyor-workflow.