Pull request for issue #680

Fixes #680. Generated by conveyor-workflow.