Pull request for issue #668

Fixes #668. Generated by conveyor-workflow.