Pull request for issue #670

Fixes #670. Generated by conveyor-workflow.