Pull request for issue #640

Fixes #640. Generated by conveyor-workflow.