Pull request for issue #579

Fixes #579. Generated by conveyor-workflow.