Pull request for issue #652

Fixes #652. Generated by conveyor-workflow.