Pull request for issue #583

Fixes #583. Generated by conveyor-workflow.