Pull request for issue #628

Fixes #628. Generated by conveyor-workflow.