Pull request for issue #666

Fixes #666. Generated by conveyor-workflow.