Pull request for issue #654

Fixes #654. Generated by conveyor-workflow.