Pull request for issue #688

Fixes #688. Generated by conveyor-workflow.