Pull request for issue #650

Fixes #650. Generated by conveyor-workflow.