Pull request for issue #619

Fixes #619. Generated by conveyor-workflow.