Pull request for issue #662

Fixes #662. Generated by conveyor-workflow.