Pull request for issue #571

Fixes #571. Generated by conveyor-workflow.