Pull request for issue #700

Fixes #700. Generated by conveyor-workflow.