Pull request for issue #625

Fixes #625. Generated by conveyor-workflow.