Pull request for issue #575

Fixes #575. Generated by conveyor-workflow.