Pull request for issue #581

Fixes #581. Generated by conveyor-workflow.