Pull request for issue #642

Fixes #642. Generated by conveyor-workflow.