Pull request for issue #569

Fixes #569. Generated by conveyor-workflow.