Pull request for issue #611

Fixes #611. Generated by conveyor-workflow.