Pull request for issue #605

Fixes #605. Generated by conveyor-workflow.