Pull request for issue #660

Fixes #660. Generated by conveyor-workflow.