Pull request for issue #634

Fixes #634. Generated by conveyor-workflow.