Pull request for issue #682

Fixes #682. Generated by conveyor-workflow.